From: Stefano Stabellini <sstabellini@kernel.org>
Date: Fri, 7 Apr 2017 22:38:58 +0000 (-0700)
Subject: Revert "setup vwfi correctly on cpu0"
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2247
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22man:/?a=commitdiff_plain;h=6772d50a50ca4315f658e33194f966e48d180384;p=xen.git

Revert "setup vwfi correctly on cpu0"

This reverts commit b32d442abd92cdd4d8f2a2e7794cfee9dba7fe22. There is
no need for this patch after "xen/arm: Set and restore HCR_EL2 register
for each vCPU separately".

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Julien Grall <julien.grall@arm.com>
---

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 3625e04a20..6bed039ced 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -117,25 +117,6 @@ static void __init parse_vwfi(const char *s)
 }
 custom_param("vwfi", parse_vwfi);
 
-static int __init vwfi_init(void)
-{
-    /*
-     * HCR_EL2 has already been set on cpu0, change the setting here, if
-     * needed. Other cpus haven't booted yet, init_traps will setup
-     * HCR_EL2 correctly.
-     */
-    if ( vwfi == NATIVE )
-    {
-        register_t hcr;
-
-        hcr = READ_SYSREG(HCR_EL2);
-        WRITE_SYSREG(hcr & ~(HCR_TWI|HCR_TWE), HCR_EL2);
-    }
-
-    return 0;
-}
-presmp_initcall(vwfi_init);
-
 register_t get_default_hcr_flags(void)
 {
     return  (HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM|